From: Benjamin Berg <bberg@redhat.com>
Date: Thu, 11 Apr 2019 17:43:35 +0000 (+0200)
Subject: shellDBus: Rename ShowMonitorLabels2 to ShowMonitorLabels
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~845^2^2~33
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=2c8d380e676b1747450791b0312a156a61d9da23;p=gnome-shell.git

shellDBus: Rename ShowMonitorLabels2 to ShowMonitorLabels

The original ShowMonitorLabels has been removed so we can change things
back to use ShowMonitorLabels again.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/491
---

diff --git a/data/dbus-interfaces/org.gnome.Shell.xml b/data/dbus-interfaces/org.gnome.Shell.xml
index 094c29444..38154cbdb 100644
--- a/data/dbus-interfaces/org.gnome.Shell.xml
+++ b/data/dbus-interfaces/org.gnome.Shell.xml
@@ -9,7 +9,7 @@
     <method name="ShowOSD">
       <arg type="a{sv}" direction="in" name="params"/>
     </method>
-    <method name="ShowMonitorLabels2">
+    <method name="ShowMonitorLabels">
       <arg type="a{sv}" direction="in" name="params"/>
     </method>
     <method name="HideMonitorLabels"/>
diff --git a/js/ui/shellDBus.js b/js/ui/shellDBus.js
index 1f328c9fe..1db5f551c 100644
--- a/js/ui/shellDBus.js
+++ b/js/ui/shellDBus.js
@@ -207,7 +207,7 @@ var GnomeShell = class {
         this._grabbers.delete(name);
     }
 
-    ShowMonitorLabels2Async(params, invocation) {
+    ShowMonitorLabelsAsync(params, invocation) {
         let sender = invocation.get_sender();
         let [dict] = params;
         Main.osdMonitorLabeler.show(sender, dict);